@@ -8,6 +8,7 @@ import android.support.v7.widget.LinearLayoutManager; |
||
| 8 | 8 |
import android.support.v7.widget.RecyclerView; |
| 9 | 9 |
import android.support.v7.widget.helper.ItemTouchHelper; |
| 10 | 10 |
import android.view.View; |
| 11 |
+import android.widget.ImageView; |
|
| 11 | 12 |
import android.widget.TextView; |
| 12 | 13 |
import android.widget.Toast; |
| 13 | 14 |
|
@@ -29,6 +30,7 @@ public class SessionActivity extends BaseActivity implements SessionContract.Vie |
||
| 29 | 30 |
@BindView(R.id.icon_no_data) View noPhotoLayout; |
| 30 | 31 |
@BindView(R.id.title_bar_middle_txt) TextView titleTextView; |
| 31 | 32 |
@BindView(R.id.recycler_view_photos) RecyclerView photosRecyclerView; |
| 33 |
+ @BindView(R.id.iv_qrcode) ImageView qrcodeScanBtn; |
|
| 32 | 34 |
private PhotoRecyclerAdapter adapter; |
| 33 | 35 |
private SessionBean sessionBean; |
| 34 | 36 |
private SessionContract.Presenter presenter; |
@@ -84,7 +86,6 @@ public class SessionActivity extends BaseActivity implements SessionContract.Vie |
||
| 84 | 86 |
presenter.start(); |
| 85 | 87 |
} |
| 86 | 88 |
|
| 87 |
- |
|
| 88 | 89 |
@Override |
| 89 | 90 |
protected void onDestroy() {
|
| 90 | 91 |
super.onDestroy(); |
@@ -124,12 +125,14 @@ public class SessionActivity extends BaseActivity implements SessionContract.Vie |
||
| 124 | 125 |
|
| 125 | 126 |
@Override |
| 126 | 127 |
public void showPhotoRecyclerView() {
|
| 128 |
+ qrcodeScanBtn.setVisibility(View.GONE); |
|
| 127 | 129 |
noPhotoLayout.setVisibility(View.GONE); |
| 128 | 130 |
photosRecyclerView.setVisibility(View.VISIBLE); |
| 129 | 131 |
} |
| 130 | 132 |
|
| 131 | 133 |
@Override |
| 132 | 134 |
public void showEmptyView() {
|
| 135 |
+ qrcodeScanBtn.setVisibility(View.VISIBLE); |
|
| 133 | 136 |
photosRecyclerView.setVisibility(View.GONE); |
| 134 | 137 |
noPhotoLayout.setVisibility(View.VISIBLE); |
| 135 | 138 |
} |
@@ -146,7 +149,7 @@ public class SessionActivity extends BaseActivity implements SessionContract.Vie |
||
| 146 | 149 |
if (data == null || data.getStringExtra("info") == null) {
|
| 147 | 150 |
return; |
| 148 | 151 |
} |
| 149 |
- LogHelper.d("qrcode","scan qrcode info = "+data.getStringExtra("info"));
|
|
| 152 |
+ presenter.change2QRCodeSessionId(data.getStringExtra("info"));
|
|
| 150 | 153 |
} |
| 151 | 154 |
} |
| 152 | 155 |
|
@@ -18,5 +18,6 @@ public class SessionContract {
|
||
| 18 | 18 |
|
| 19 | 19 |
interface Presenter extends BasePresenter{
|
| 20 | 20 |
void swipeToDeletePhoto(int index); |
| 21 |
+ void change2QRCodeSessionId(String sessionId); |
|
| 21 | 22 |
} |
| 22 | 23 |
} |
@@ -28,11 +28,11 @@ public class SessionPresenter implements SessionContract.Presenter, SessionInter |
||
| 28 | 28 |
public SessionPresenter(SessionBean sessionBean, SessionContract.View view) {
|
| 29 | 29 |
this.sessionView = view; |
| 30 | 30 |
this.sessionBean = sessionBean; |
| 31 |
- interactor = new SessionInteractor(sessionBean, this); |
|
| 32 | 31 |
} |
| 33 | 32 |
|
| 34 | 33 |
@Override |
| 35 | 34 |
public void start() {
|
| 35 |
+ interactor = new SessionInteractor(sessionBean, this); |
|
| 36 | 36 |
photoList = DBService.getInstance().getPhotoListBySessionId(sessionBean.sessionId); |
| 37 | 37 |
if (photoList.size() == 0) {
|
| 38 | 38 |
sessionView.showEmptyView(); |
@@ -96,10 +96,17 @@ public class SessionPresenter implements SessionContract.Presenter, SessionInter |
||
| 96 | 96 |
return; |
| 97 | 97 |
} |
| 98 | 98 |
PhotoBean photoBean = photoList.get(index); |
| 99 |
- LogHelper.d("DBService","swipeToDeletePhoto" +photoBean.photoId);
|
|
| 100 | 99 |
photoList.remove(photoBean); |
| 101 | 100 |
DBService.getInstance().deletePhotoBean(photoBean); |
| 102 | 101 |
interactor.deletePhoto(photoBean); |
| 103 | 102 |
} |
| 104 | 103 |
|
| 104 |
+ @Override |
|
| 105 |
+ public void change2QRCodeSessionId(String sessionId) {
|
|
| 106 |
+ LogHelper.d("czy","change2QRCodeSessionId ="+sessionId);
|
|
| 107 |
+ this.sessionBean.sessionId = sessionId; |
|
| 108 |
+ stop(); |
|
| 109 |
+ start(); |
|
| 110 |
+ } |
|
| 111 |
+ |
|
| 105 | 112 |
} |